From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Tue, 16 Jul 2013 22:59:00 +0000 (-0400)
Subject: network: Remove the firmware changed signal
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3860
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f8225141dcee195a302bda93bf0d8bf3df416994;p=gnome-shell.git

network: Remove the firmware changed signal

According to Dan Williams, if firmware is installed the device
will disappear and reappear, and this is unlikely to change any
time soon. Just make our lives easier by removing the tracking.

https://bugzilla.gnome.org/show_bug.cgi?id=704670
---

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 98ba7284e..c3cbf4137 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -306,10 +306,6 @@ const NMDevice = new Lang.Class({
                 GObject.Object.prototype.disconnect.call(this._device, this._activeConnectionChangedId);
                 this._stateChangedId = 0;
             }
-            if (this._firmwareChangedId) {
-                GObject.Object.prototype.disconnect.call(this._device, this._firmwareChangedId);
-                this._firmwareChangedId = 0;
-            }
 
             this._device = null;
         }
@@ -375,14 +371,6 @@ const NMDevice = new Lang.Class({
         // in the majority of cases (wired, wwan)
     },
 
-    _firmwareChanged: function() {
-        if (this._firmwareChangedId) {
-            GObject.Object.prototype.disconnect.call(this._device, this._firmwareChangedId);
-            this._firmwareChangedId = 0;
-        }
-        this._substateChanged();
-    },
-
     getStatusLabel: function() {
         if (!this._device)
             return null;
@@ -411,9 +399,6 @@ const NMDevice = new Lang.Class({
             // firmware missing), that are exposed by different properties (whose state may
             // or may not updated when we receive state-changed).
             if (this._device.firmware_missing) {
-                if (!this._firmwareChangedId)
-                    this._firmwareChangedId = this._device.connect('notify::firmware-missing', Lang.bind(this, this._firmwareChanged));
-
                 /* Translators: this is for devices that require some kind of firmware or kernel
                    module, which is missing */
                 return _("firmware missing");